Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Jul 2011 01:37:23 +0000 (18:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Jul 2011 01:37:23 +0000 (18:37 -0700)
commitaf119239c6f7673b64dc19f75bf19eb9a06b4346
treeab1b33b03ba3b36d5fd49ed3e4555986fceabe4b
parentf7622945202ececf0dd1454ff4941e985445bed3
parent22f69131cfb5cf50b5954daf018fabbc5b7f02b2
Merge from trunk.